bitkeeper revision 1.733 (4033c881640VDHdXFsEr2MkEnXSo5w)

ide-disk.c, apic.c:
  Remove noisy output in Xen. Make IDE startup more informative.

diff --git a/xen/arch/i386/apic.c b/xen/arch/i386/apic.c
index b3cd649c9cdfa2c9388db0885934b6337adc2e6e..469890b488d4d74ff9ee36a8e305d5dc1e387f83 100644 (file)
--- a/xen/arch/i386/apic.c
+++ b/xen/arch/i386/apic.c
@@ -678,8 +678,8 @@ int reprogram_ac_timer(s_time_t timeout)
     expire = timeout - now; /* value from now */
 
     if (expire <= 0) {
-        printk("APICT[%02d] Timeout in the past 0x%08X%08X > 0x%08X%08X\n", 
-               cpu, (u32)(now>>32), (u32)now, (u32)(timeout>>32),(u32)timeout);
+        Dprintk("APICT[%02d] Timeout in the past 0x%08X%08X > 0x%08X%08X\n", 
+                cpu, (u32)(now>>32), (u32)now, (u32)(timeout>>32),(u32)timeout);
         return 0;       /* timeout value in the past */
     }
 
@@ -694,11 +694,11 @@ int reprogram_ac_timer(s_time_t timeout)
     apic_tmict = (((u64)bus_scale) * expire)>>18;
 
     if (apic_tmict >= 0xffffffff) {
-        printk("APICT[%02d] Timeout value too large\n", cpu);
+        Dprintk("APICT[%02d] Timeout value too large\n", cpu);
         apic_tmict = 0xffffffff;
     }
     if (apic_tmict == 0) {
-        printk("APICT[%02d] timeout value too small\n", cpu);
+        Dprintk("APICT[%02d] timeout value too small\n", cpu);
         return 0;
     }
 
@@ -706,8 +706,6 @@ int reprogram_ac_timer(s_time_t timeout)
     /* Program the timer. */
     apic_write(APIC_TMICT, (unsigned long)apic_tmict);
 
-    TRC(printk("APICT[%02d] reprog(): expire=%lld %u\n",
-               cpu, expire, apic_tmict));
     return 1;
 }
 

diff --git a/xen/drivers/ide/ide-disk.c b/xen/drivers/ide/ide-disk.c
index eb4a972b01ce95b9242d58512d47f3ded38f00bf..9611322ec56e5e4b211d8d6bfaae5362df13d630 100644 (file)
--- a/xen/drivers/ide/ide-disk.c
+++ b/xen/drivers/ide/ide-disk.c
@@ -1399,7 +1399,9 @@ static void idedisk_setup (ide_drive_t *drive)
 #ifdef CONFIG_BLK_DEV_IDEDMA
        if (drive->using_dma)
                (void) HWIF(drive)->dmaproc(ide_dma_verbose, drive);
+       else
 #endif /* CONFIG_BLK_DEV_IDEDMA */
+               printk(" PIO (slow!)");
        printk("\n");
 
        drive->mult_count = 0;